Xen/ia64 build fixes.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk
index 2a879dd2d1ddb851c4acbdc0e9508f8782b96492..96eb4e790d06786566cc2a25b32eac6f8dc64239 100644 (file)
--- a/xen/arch/ia64/Rules.mk
+++ b/xen/arch/ia64/Rules.mk
@@ -12,7 +12,7 @@ CPPFLAGS  += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64       \
             -I$(BASEDIR)/include/asm-ia64/linux-null                   \
              -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
 
-CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
+CFLAGS  += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
 #CFLAGS  += -O3                # -O3 over-inlines making debugging tough!
 CFLAGS  += -O2         # but no optimization causes compile errors!
 #CFLAGS  += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)

diff --git a/xen/include/asm-ia64/xensystem.h b/xen/include/asm-ia64/xensystem.h
index 10c722da5d94cc958bd7a06089081e9a22484959..9c8ede0df21968edefe54e3b734217ec4da6a172 100644 (file)
--- a/xen/include/asm-ia64/xensystem.h
+++ b/xen/include/asm-ia64/xensystem.h
@@ -75,5 +75,7 @@ extern struct task_struct *vmx_ia64_switch_to (void *next_task);
 // FIXME SMP... see system.h, does this need to be different?
 #define switch_to(prev,next,last)      __switch_to(prev, next, last)
 
+#define local_irq_is_enabled() (!irqs_disabled())
+
 #endif // __ASSEMBLY__
 #endif // _ASM_IA64_XENSYSTEM_H